Skip to content

chore: sync upstream (2026-11-21) - #34

Merged
getBoolean merged 611 commits into
mainfrom
sync/upstream-2026-11-21
Nov 21, 2026
Merged

getBoolean merged 611 commits into
mainfrom
sync/upstream-2026-11-21

Conversation

@getBoolean

@getBoolean getBoolean commented Nov 21, 2026 •

Copy link
Copy Markdown
Owner

Merges upstream pingdotgg/t3code main into the fork: 759a173e15..c1464d6774 (607 commits), as a merge commit with upstream history kept.

Conflicts and how they were resolved

28 files conflicted. In each, upstream's change was taken and the fork's intent from .github/fork-manifest.txt re-applied.

Server and packages

  • McpHttpServer.ts, ProviderTurnStartService.ts, ws.ts, desktopUpdate.logic.ts: import-only. Kept the fork's Fork: header and upstream's new imports. desktopUpdate.logic.ts imports both CLI_RELEASE_REPOSITORY (fork) and desktopUpdateChannelOf (upstream).
  • CodexAdapterV2.ts, provider-acp/adapter.ts, provider-opencode/adapter.ts: kept both the fork's appliesAccountEnvironment and upstream's new checksVersionAtHandshake.
  • ProviderSessionManager.test.ts, ProviderTurnStartService.test(kit).ts: kept both the fork's git-account fixtures and upstream's new ones (eventStreamsEnded, PullRequestService mock).
  • mcp/toolkits/project/handlers.ts: t3_project_read now returns upstream's withSavedProjectSettings(project) plus the fork's gitAccount metadata.
  • AntigravityDriver.ts: upstream added per-thread processEnvironment. The fork's account overlay is now applied on top of the thread environment, so the bound git identity still wins.
  • GitLabCli.ts: with an account credential, the fork's GITLAB_HOST/GITLAB_TOKEN env applies. Without one, upstream's host env and its token stripping for caller-named hosts apply.
  • packages/shared/threadLinks.ts: upstream moved relabelThreadLinks to threadLinksCopy.ts. The fork's rule that keeps scoped v2 links navigable when uncached moved with it, and the manifest anchor was repointed.
  • agentContextBudget.json: re-measured. Upstream's values plus the fork's git-account tool give mcpToolListJsonBytes 59803.
  • pnpm-lock.yaml: regenerated with vp i. All patches apply, including the fork-only expo-modules-autolinking patch.

Web

  • GitActionsControl.tsx: upstream split thread logic out into ThreadGitActionsControl and an owner prop. The fork's account guard before commit/push/PR now targets threadRef plus owner.projectId; the server resolves a saved thread's project.
  • MarkdownThreadLink.tsx: kept upstream's new linked-environment chip, followed by the fork's branch that keeps uncached scoped links openable.

Mobile

  • createWorkspaceStackNavigator.ios.tsx / WorkspaceNativeTabs.ios.tsx: upstream replaced WorkspaceSidebarTabsFooter with WorkspaceTabDock. Expanded iPads still get the fork's IpadSidebarActions at the foot of the sidebar column. Compact layouts render upstream's WorkspaceTabDock (column placement inside the pre-iOS 26 JS sidebar slot, window otherwise) under the fork's visibility rule.
  • WorkspaceTabsContext.tsx: upstream's saveMobilePreferences command, and the fork's selectedTab override is kept.
  • ThreadFeed.tsx, state/entities.ts, markdownDocument.ts: useLiveThreadLinkLabels(markdown, env, linked, parent) combines upstream's linked-environment labels with the fork's provider-native subagent links and titles. Both new markdown helpers are kept.
  • GitOverviewSheet.tsx, use-selected-thread-git-actions.ts: upstream's repository-target support, plus the fork's account guard and its "Using this machine's git login" row.
  • thread-inspector-preview.tsx: kept the fork's local inspector stack (file drill-ins, expand-to-modal). Upstream's ThreadInspectorHeader now comes from its new thread-inspector-header.tsx, and upstream's linked-thread inspector is kept. thread-preview-route.tsx stays deleted, as before.
  • thread-inspector-navigation.test.tsx: setup() takes both upstream's inspectorSupported and the fork's sheet.

Fork adaptations after the merge

  • fix(mobile): keep the preview tunnel building on iOS 17: upstream's new t3-preview-tunnel module declared :ios, '18.0'. Its APIs (ProxyConfiguration, WKWebsiteDataStore.proxyConfigurations, NWListener) are iOS 17.0, so the podspec is lowered to 17.0, like T3VoiceTranscription and T3WebSocket. Added to the manifest.
  • fix(mobile): repository picker list uses the fork's native scroll renderer: upstream added a second LegendList to NewTaskContextPickerScreens.tsx, where the fork had switched to renderNativeScrollView.
  • Manifest anchor update: ThreadContextChip.tsx no longer has the gt("Open thread") tooltip after upstream's hover-card change. The fork's "uncached targets stay openable" behaviour is the unconditional Link, now anchored on to="/$environmentId/$threadId".
  • Fork CI: enabling-fork-ci --rewrite-runners --prefix T3CODE rewrote the one new Blacksmith label, on release.yml's upstream-only "Check the update feed" job. No new pingdotgg/t3code guards that the fork needs to run, and no new macOS jobs in ci.yml.

Verification

  • bash scripts/check-fork-manifest.sh: 574 entries present.
  • Fork suites:
    • server src/gitAccounts, Manager, npmRelease, PullRequestService, mcp/toolkits/project, plus ProviderSessionManager, ProviderTurnStartService, Drivers and AgentContextBudget: 674 passed. ClaudeSkills.test.ts fails 2 cases on this Mac only; the file and everything it imports are identical to upstream, and the failure is macOS-path specific (CI runs Linux).
    • web: GitAccountsSettings, MarkdownThreadLink, desktopUpdate.logic (19 passed).
    • mobile: remoteRegistration, thread-inspector-navigation, use-selected-thread-git-actions, src/lib (902 passed).
    • shared: threadLinks (20 passed).
  • vp run check:changed: format, lint, knip, unused patches, graphql and React compiler pass. Typecheck passes after the scroll-renderer fix. The local test step hit its 900s cap while the iOS build had the machine; CI runs the full suites.

iOS 17

apps/mobile/app.config.ts keeps deploymentTarget: "17.0", so the proof ran on this Mac.

  • Risk review: the merge adds one native module, t3-preview-tunnel. Its podspec declared iOS 18.0, so it was lowered to 17.0 (above); every API it uses is iOS 17.0 or earlier. Upstream's new Apple Speech code is behind #available(iOS 26, *). react-native-screens moved from the fork tarball t3.58 to t3.61. Nothing in infra/relay or packages/contracts/src/relay.ts uses iosMajorVersion. No new JS paths need iOS 18.
  • Build: prebuild, /opt/homebrew/bin/pod install, then xcodebuild Release for generic/platform=iOS Simulator with Xcode 26.6: BUILD SUCCEEDED. Every deployment target is at most 17.0 (15.1, 16.4 and 17.0 only).
  • Symbols: check-ios17-libcxx-imports.sh: 7 Mach-O files import 277 libc++ symbols, all exported by iOS 17.0. check_runtime_symbols.py --runtime 17.0: 10986 imports checked, nothing missing.
  • Launch: the Release app ran past 30 s on an iOS 17.0 iPhone 15 Pro and an iOS 17.0 iPad Air 5 simulator.
  • Native walk: native-surfaces-open passed with 0 failed steps on both the iPhone and the iPad (--pose ipad).
iPhone 15 Pro (iOS 17.0) iPad Air 5 (iOS 17.0)
Launch
Compose
Source control (git accounts)

CI

All 19 checks passed on fe00174.


Opus 5.5 (claude-opus-5-5) via Claude Code in T3 Code.

juliusmarminge and others added 30 commits November 19, 2026 20:58
…6499)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ents that failed (pingdotgg#39536)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#39552)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39548)

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
pingdotgg#39562)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n closes (pingdotgg#39569)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#39579)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39598)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39605)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…when they exit (pingdotgg#38348)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…a failure (pingdotgg#39596)

Co-authored-by: Ryan McDonough <Ryan@r2n.io>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ands (pingdotgg#39618)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lized scroll windows (pingdotgg#39574)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…es (pingdotgg#39636)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#39643)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…helper (pingdotgg#39665)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
viktorce and others added 28 commits November 20, 2026 23:37
…40149)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40069)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ffort summaries (pingdotgg#40136)

Co-authored-by: thecsguy <344173356+itsthecsguy@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…CODE_TANSTACK_SOURCE (pingdotgg#40207)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit b32f90b)
…rt grow-in

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit 4ce558b)
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit cbc50d8)
Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…11-21

# Conflicts:
#	apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx
#	apps/mobile/src/features/layout/workspace/WorkspaceNativeTabs.ios.tsx
#	apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
#	apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx
#	apps/mobile/src/features/threads/thread-inspector-preview.tsx
#	apps/mobile/src/lib/markdownDocument.ts
#	apps/mobile/src/state/entities.ts
#	apps/mobile/src/state/use-selected-thread-git-actions.ts
#	apps/server/src/mcp/McpHttpServer.ts
#	apps/server/src/mcp/toolkits/project/handlers.ts
#	apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
#	apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.testkit.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.ts
#	apps/server/src/provider/Drivers/AntigravityDriver.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/ws.ts
#	apps/web/src/components/GitActionsControl.tsx
#	apps/web/src/components/chat/MarkdownThreadLink.tsx
#	apps/web/src/components/desktopUpdate.logic.ts
#	packages/provider-acp/src/server/adapter.ts
#	packages/provider-opencode/src/server/adapter.ts
#	packages/shared/src/threadLinks.ts
#	packages/source-control-gitlab/src/server/GitLabCli.ts
#	pnpm-lock.yaml
@getBoolean
getBoolean merged commit d19159a into main Nov 21, 2026
19 checks passed
@getBoolean
getBoolean deleted the sync/upstream-2026-11-21 branch November 21, 2026 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.